ci: bypass branch policy when merging the release PR - #31
Merged
Conversation
The main ruleset requires reviews and only allows the merge-commit method; the bot token cannot satisfy it, so the release PR merge fails with 'base branch policy prohibits the merge'. Fall back to an admin-bypass merge in CI using RELEASE_PLEASE_TOKEN.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
mainruleset requires 1 review + code-owner review and only allows the merge-commit method, while the repo only enables squash — the bot's plaingh pr merge --squashis always rejected with 'base branch policy prohibits the merge' (human merges have been silently bypassing as org admins).Fix: in CI, try a plain merge first, fall back to
--admin(RELEASE_PLEASE_TOKEN). Authorized to keep the ruleset strict for outside contributors while letting the release bot through.Merging this triggers Release Please, which will pick up the dangling release PR and merge it in CI — cutting the pending release automatically.